Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Dec 2011 00:22:31 +0000 (16:22 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Dec 2011 00:22:31 +0000 (16:22 -0800)
commit1daefb67a8e492dcb7335aefe3633b9fb16fb470
treea0012c3f0032f606d44a77e36a222350fdf2a640
parentc80d79332964dbe3eaaf7c8b866e0d6ca382b841
parent9bc177927f1d0c9c06f630f0ba4bbde9a41d1be5
Merge from trunk.